GUI: Fix support for multiple input files [1906387].

diff --git a/win32/GPSBabelGUI.exe b/win32/GPSBabelGUI.exe
index 065b0e7579c8ef095d048ad471213ee38c40caac..ccc78f012f73da614c9378ffd329843a22f6b642 100644 (file)
Binary files a/win32/GPSBabelGUI.exe and b/win32/GPSBabelGUI.exe differ

diff --git a/win32/gui-2/GPSBabelGUI.cfg b/win32/gui-2/GPSBabelGUI.cfg
index 511e5eef37c7411f4127a39419c4aa0ddce8968d..8adc0e882812025cbc16b3a998e1d6ec2dd07a1b 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.cfg
+++ b/win32/gui-2/GPSBabelGUI.cfg
@@ -31,5 +31,5 @@
 -M\r
 -$M16384,1048576\r
 -K$00400000\r
--LNd:\borland\delphi4\Lib\r
+-LNc:\programme\borland\delphi4\Lib\r
 -DMSWINDOWS\r

diff --git a/win32/gui-2/GPSBabelGUI.dof b/win32/gui-2/GPSBabelGUI.dof
index 95ca2d6eb208616ed0d078975ac089c7dd2a9cba..8788f27262c0fe0e3d46531c109cd2272c7866ff 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.dof
+++ b/win32/gui-2/GPSBabelGUI.dof
@@ -56,7 +56,7 @@ IncludeVerInfo=1
 AutoIncBuild=0\r
 MajorVer=0\r
 MinorVer=2\r
-Release=12\r
+Release=13\r
 Build=0\r
 Debug=0\r
 PreRelease=0\r
@@ -68,16 +68,14 @@ CodePage=1252
 [Version Info Keys]\r
 CompanyName=GPSBabel Makers\r
 FileDescription=GPSBabel Windows Frontend\r
-FileVersion=0.2.12.0\r
+FileVersion=0.2.13.0\r
 InternalName=\r
-LegalCopyright=(C) 2005-2007 Olaf Klein (o.b.klein@gpsbabel.org)\r
+LegalCopyright=(C) 2005-2008 Olaf Klein (o.b.klein@gpsbabel.org)\r
 LegalTrademarks=\r
 OriginalFilename=GPSBabelGUI.exe\r
 ProductName=GPSBabel\r
 ProductVersion=1.3.x\r
 Comments=\r
-[Excluded Packages]\r
-$(DELPHI)\Lib\dclusr40.bpl=Borland User\r
 [HistoryLists\hlConditionals]\r
 Count=1\r
 Item0=MSWINDOWS\r

diff --git a/win32/gui-2/GPSBabelGUI.dpr b/win32/gui-2/GPSBabelGUI.dpr
index 5a9a8970878c2e67ba62a413d1b702cff7a34545..9dd0094e0b0ea559ea9de5c39d991c4263b8d5e8 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.dpr
+++ b/win32/gui-2/GPSBabelGUI.dpr
@@ -30,7 +30,6 @@ uses
   common in 'common.pas',\r
   filter in 'filter.pas' {frmFilter},\r
   about in 'about.pas' {frmAbout},\r
-  readme in 'readme.pas' {frmReadme},\r
   options in 'options.pas' {frmOptions},\r
   select in 'select.pas' {frmSelect};\r
 \r
@@ -50,6 +49,5 @@ begin
 \r
   Application.Initialize;\r
   Application.CreateForm(TfrmMain, frmMain);\r
-  Application.CreateForm(TfrmReadme, frmReadme);\r
   Application.Run;\r
 end.\r

diff --git a/win32/gui-2/GPSBabelGUI.res b/win32/gui-2/GPSBabelGUI.res
index a1bfc0358297484eb7ea4145e074c75d1ede98e3..3776c1003a776aeaf5456deff25db3cf63227065 100644 (file)
Binary files a/win32/gui-2/GPSBabelGUI.res and b/win32/gui-2/GPSBabelGUI.res differ

diff --git a/win32/gui-2/Makefile b/win32/gui-2/Makefile
index 3322d791d9e4420893a049f628c4b3e79a6feaa2..116e8dde778fcb49c0fc2754ca4288aaa1849997 100644 (file)
--- a/win32/gui-2/Makefile
+++ b/win32/gui-2/Makefile
@@ -8,9 +8,9 @@ RC = brcc32.exe
 \r
 SRC = delphi.pas gnugettext.pas gnugettextD4.pas gnugettextD5.pas \\r
   gnugettextDx.pas common.pas utils.pas \\r
-  about.pas filter.pas options.pas main.pas readme.pas select.pas\r
+  about.pas filter.pas options.pas main.pas select.pas\r
 \r
-FRM = about.dfm filter.dfm options.dfm main.dfm readme.dfm select.dfm \r
+FRM = about.dfm filter.dfm options.dfm main.dfm select.dfm \r
 \r
 LANG = \\r
   locale\de\LC_MESSAGES\delphi.mo \\r
@@ -54,8 +54,8 @@ GPSBabelGUI.res: GPSBabelGUI.dof dof2rc.exe
        $(RC) GPSBabelGUI.rc\r
 \r
 clean:\r
-       rm -f *.bak *.dcu *.exe *.mo *.dll *.res *.rc\r
        rm -f *.~* *.??~ \r
+       rm -f *.bak *.dcu *.exe *.mo *.dll *.res *.rc\r
        rm -f readme.html README readme.xml\r
        rm -f locale\de\LC_MESSAGES\*.mo\r
        rm -f locale\es\LC_MESSAGES\*.mo\r

diff --git a/win32/gui-2/about.dfm b/win32/gui-2/about.dfm
index d4dab20eea907246c481cf10cc1367af63c70004..da7417a420d02497e7c9f9a6225fbeb2cb903f02 100644 (file)
Binary files a/win32/gui-2/about.dfm and b/win32/gui-2/about.dfm differ

diff --git a/win32/gui-2/main.dfm b/win32/gui-2/main.dfm
index 66d6ff535e11a32c77de6b3ac3ccad47f0246bf4..6561c8ccab00fdb09d14b5cc55a5fb142f009bf3 100644 (file)
Binary files a/win32/gui-2/main.dfm and b/win32/gui-2/main.dfm differ

diff --git a/win32/gui-2/main.pas b/win32/gui-2/main.pas
index 9bb22873118041a93f012c9873c08964ad524816..c90c8a77de23e1b8b89789ad9cc47b370af64437 100644 (file)
--- a/win32/gui-2/main.pas
+++ b/win32/gui-2/main.pas
@@ -47,9 +47,7 @@ type
     trkOutputOK: TSpeedButton;\r
     ActionList1: TActionList;\r
     acLetsGo: TAction;\r
-    btnFilter: TBitBtn;\r
     acFilterSelect: TAction;\r
-    btnProcess: TBitBtn;\r
     stbMain: TStatusBar;\r
     mnuMain: TMainMenu;\r
     mnuFile: TMenuItem;\r
@@ -61,7 +59,7 @@ type
     Intro1: TMenuItem;\r
     About1: TMenuItem;\r
     mnuReadme: TMenuItem;\r
-    acHelpReadme: TAction;\r
+    acHelpDoc: TAction;\r
     N1: TMenuItem;\r
     mnuOptions: TMenuItem;\r
     mnuSynthesizeShortNames: TMenuItem;\r
@@ -139,6 +137,8 @@ type
     pmnuForceselectedGPSdatatypesnuketypesfilter: TMenuItem;\r
     pmnu9: TMenuItem;\r
     pmnuFilter: TMenuItem;\r
+    btnFilter: TBitBtn;\r
+    btnProcess: TBitBtn;\r
     procedure FormShow(Sender: TObject);\r
     procedure FormCreate(Sender: TObject);\r
     procedure OpenButtonClick(Sender: TObject);\r
@@ -157,7 +157,7 @@ type
     procedure chbInputDeviceClick(Sender: TObject);\r
     procedure FormClose(Sender: TObject; var Action: TCloseAction);\r
     procedure chbOutputDeviceClick(Sender: TObject);\r
-    procedure acHelpReadmeExecute(Sender: TObject);\r
+    procedure acHelpDocExecute(Sender: TObject);\r
     procedure edOutputFileKeyPress(Sender: TObject; var Key: Char);\r
     procedure cbInputFormatDeviceChange(Sender: TObject);\r
     procedure cbOutputFormatDeviceChange(Sender: TObject);\r
@@ -217,7 +217,7 @@ var
 implementation\r
 \r
 uses\r
-  filter, about, readme, options, select;\r
+  filter, about, options, select;\r
 \r
 {$R *.DFM}\r
 \r
@@ -384,7 +384,15 @@ end;
 procedure TfrmMain.FormShow(Sender: TObject);\r
 begin\r
   if not(FFirstShow) then Exit;\r
-  \r
+\r
+{$IFDEF VER120}\r
+  // --------------------\r
+  // Bug (?) Delphi4-Std./Sp3\r
+  FixAlign(btnProcess, 8);\r
+  FixAlign(btnFilter, 16, btnProcess);\r
+  // --------------------\r
+{$ENDIF}\r
+\r
   FFirstShow := False;\r
   PostMessage(SELF.Handle, WM_STARTUP, 0, 0); // keep sure our window is visible\r
 end;\r
@@ -400,7 +408,7 @@ begin
 \r
   // ? valid README form\r
   s := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html';\r
-  acHelpReadme.Enabled := FileExists(s) or (frmReadme.Memo.Lines.Count > 0);\r
+  acHelpDoc.Enabled := FileExists(s);\r
 \r
   InitializeSerialPorts;\r
 end;\r
@@ -449,7 +457,7 @@ begin
   for i := 0 to dlgFileOpen.Files.Count - 1 do\r
   begin\r
     s := dlgFileOpen.Files[i];\r
-    if (Pos('"', s) <> 0) or (Pos(' ', s) <> 0) or (Pos(',', s) <> 0) then\r
+    if (s[1] <> '"') or (s[Length(s)] <> '"') then\r
       s := AnsiQuotedStr(s, '"');\r
     if (edInputFile.Text <> '') then edInputFile.Text := edInputFile.Text + ', ';\r
     edInputFile.Text := edInputFile.Text + s;\r
@@ -988,18 +996,13 @@ begin
   CheckInput;\r
 end;\r
 \r
-procedure TfrmMain.acHelpReadmeExecute(Sender: TObject);\r
+procedure TfrmMain.acHelpDocExecute(Sender: TObject);\r
 var\r
   s: string;\r
 begin\r
   s := ExtractFilePath(ParamStr(0)) + 'gpsbabel.html';\r
   if FileExists(s) then\r
     WinOpenFile(s, '')   // new gpsbabel.html\r
-  else begin // show the old readme\r
-    if (frmReadme = nil) then\r
-      Application.CreateForm(TfrmReadme, frmReadme);\r
-    frmReadme.ShowModal;\r
-  end;\r
 end;\r
 \r
 procedure TfrmMain.edOutputFileKeyPress(Sender: TObject; var Key: Char);\r
@@ -1265,9 +1268,6 @@ begin
     form := frmFilter;\r
     frmFilter := nil;\r
     if (Form <> nil) then Form.Release;\r
-    form := frmReadme;\r
-    frmReadme := nil;\r
-    if (Form <> nil) then Form.Release;\r
     form := frmAbout;\r
     frmAbout := nil;\r
     if (Form <> nil) then Form.Release;\r